From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 18 Apr 2018 01:50:14 +0000 (+0000)
Subject: Merge "Update CREDITS and .mailmap" into REL1_31
X-Git-Tag: 1.31.0-rc.0~40
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin//%22%24path/%7B%24disabledImages%5B%24type%5D%7D/%22?a=commitdiff_plain;h=b91529b736c45f0a0df6fddddd1efd82c9de4200;p=lhc%2Fweb%2Fwiklou.git

Merge "Update CREDITS and .mailmap" into REL1_31
---

b91529b736c45f0a0df6fddddd1efd82c9de4200